Skip to content

A few OpenCL fixes#18065

Merged
TurboGit merged 2 commits intodarktable-org:masterfrom
jenshannoschwalm:opencl_50_fixes
Jan 21, 2025
Merged

A few OpenCL fixes#18065
TurboGit merged 2 commits intodarktable-org:masterfrom
jenshannoschwalm:opencl_50_fixes

Conversation

@jenshannoschwalm
Copy link
Copy Markdown
Collaborator

  1. In globaltonemap the OpenCL code was most likely disabled as we checked for micro_nap instead of avoid_atomics
  2. Included dt_iop_nap in dt_opencl_micro_nap(), it's api has changed to void dt_opencl_micro_nap(const int devid)
  3. In atrous we didn't properly check for the per-device nap
  4. Corrected a few OpenCL error codes

Would also be safe for 5.0 branch but certainly not required for stability, globaltonemap is not used often and atrous is only affected in case you have multiple devices.

Nothing worth to mention in release notes i think.

@jenshannoschwalm jenshannoschwalm added priority: low core features work as expected, only secondary/optional features don't difficulty: trivial some changes in a couple of functions OpenCL Related to darktable OpenCL code labels Dec 25, 2024
@jenshannoschwalm jenshannoschwalm added this to the 5.2 milestone Dec 25, 2024
@jenshannoschwalm jenshannoschwalm force-pushed the opencl_50_fixes branch 4 times, most recently from 5b089ab to af35b75 Compare January 5, 2025 06:02
1. In globaltonemap the OpenCL code was most likely disabled as we checked for micro_nap instead of avoid_atomics
2. Included dt_iop_nap in dt_opencl_micro_nap(), it's api has changed to `void dt_opencl_micro_nap(const int devid)`
3. In atrous we didn't properly check for the per-device nap
4. Corrected a few OpenCL error codes
In all cases of kernel / cl_mem access errors the device name is also logged.

bdebfr
Copy link
Copy Markdown
Member

@TurboGit TurboGit left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@TurboGit TurboGit merged commit b952d8c into darktable-org:master Jan 21, 2025
@jenshannoschwalm jenshannoschwalm deleted the opencl_50_fixes branch January 21, 2025 20:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

difficulty: trivial some changes in a couple of functions OpenCL Related to darktable OpenCL code priority: low core features work as expected, only secondary/optional features don't scope: debugging

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants